From c9c7313b512b89e11a89a42d7673470a5aa09ed0 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Wed, 15 Dec 2021 22:22:37 -0500 Subject: [PATCH] Deprecate navicache (#793) * Deprecate navicache. --- CMakeLists.txt | 1 - GPSBabel.pro | 1 - navicache.cc => deprecated/navicache.cc | 0 reference/format0.txt | 1 - reference/format1.txt | 1 - reference/format2.txt | 1 - reference/format3.txt | 4 -- reference/help.txt | 2 - reference/navicache.xml | 91 ------------------------- reference/navicache~unicsv.txt | 3 - testo.d/navicache.test | 5 -- tools/nuke_format | 7 +- vecs.h | 9 --- xmldoc/formats/navicache.xml | 8 --- 14 files changed, 4 insertions(+), 130 deletions(-) rename navicache.cc => deprecated/navicache.cc (100%) delete mode 100644 reference/navicache.xml delete mode 100644 reference/navicache~unicsv.txt delete mode 100644 testo.d/navicache.test delete mode 100644 xmldoc/formats/navicache.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index f562b5ec8..6a14dbd9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,6 @@ set(ALL_FMTS ${MINIMAL_FMTS} mtk_locus.cc mtk_logger.cc mynav.cc - navicache.cc navilink.cc navitel.cc osm.cc diff --git a/GPSBabel.pro b/GPSBabel.pro index 2d1ebccdc..457580c58 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -115,7 +115,6 @@ ALL_FMTS = $$MINIMAL_FMTS \ mtk_locus.cc \ mtk_logger.cc \ mynav.cc \ - navicache.cc \ navilink.cc \ navitel.cc \ osm.cc \ diff --git a/navicache.cc b/deprecated/navicache.cc similarity index 100% rename from navicache.cc rename to deprecated/navicache.cc diff --git a/reference/format0.txt b/reference/format0.txt index 75281f471..e87ab3a7c 100644 --- a/reference/format0.txt +++ b/reference/format0.txt @@ -86,7 +86,6 @@ mynav trc MyNav TRC format tpg tpg National Geographic Topo .tpg (waypoints) tpo2 tpo National Geographic Topo 2.x .tpo tpo3 tpo National Geographic Topo 3.x/4.x .tpo -navicache Navicache.com XML navigonwpt Navigon Waypoints navilink NaviGPS GT-11/BGT-11 Download sbp sbp NaviGPS GT-31/BGT-31 datalogger (.sbp) diff --git a/reference/format1.txt b/reference/format1.txt index 4af18c9e4..b041fb548 100644 --- a/reference/format1.txt +++ b/reference/format1.txt @@ -92,7 +92,6 @@ file mynav trc MyNav TRC format file tpg tpg National Geographic Topo .tpg (waypoints) file tpo2 tpo National Geographic Topo 2.x .tpo file tpo3 tpo National Geographic Topo 3.x/4.x .tpo -file navicache Navicache.com XML file navigonwpt Navigon Waypoints serial navilink NaviGPS GT-11/BGT-11 Download file sbp sbp NaviGPS GT-31/BGT-31 datalogger (.sbp) diff --git a/reference/format2.txt b/reference/format2.txt index 387d69e18..4d37d6469 100644 --- a/reference/format2.txt +++ b/reference/format2.txt @@ -92,7 +92,6 @@ file --r--- mynav trc MyNav TRC format file rw---- tpg tpg National Geographic Topo .tpg (waypoints) file --r--- tpo2 tpo National Geographic Topo 2.x .tpo file r-r-r- tpo3 tpo National Geographic Topo 3.x/4.x .tpo -file r----- navicache Navicache.com XML file rw---- navigonwpt Navigon Waypoints serial rwrwrw navilink NaviGPS GT-11/BGT-11 Download file --r--- sbp sbp NaviGPS GT-31/BGT-31 datalogger (.sbp) diff --git a/reference/format3.txt b/reference/format3.txt index 1afba14ea..37282d434 100644 --- a/reference/format3.txt +++ b/reference/format3.txt @@ -902,10 +902,6 @@ file --r--- tpo2 tpo National Geographic Topo 2.x .tpo tpo2 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tpo2.html file r-r-r- tpo3 tpo National Geographic Topo 3.x/4.x .tpo tpo3 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tpo3.html -file r----- navicache Navicache.com XML navicache - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_navicache.html -option navicache noretired Suppress retired geocaches boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_navicache.html#fmt_navicache_o_noretired - file rw---- navigonwpt Navigon Waypoints xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_navigonwpt.html option navigonwpt snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_navigonwpt.html#fmt_navigonwpt_o_snlen diff --git a/reference/help.txt b/reference/help.txt index 6d443e3ab..09116c940 100644 --- a/reference/help.txt +++ b/reference/help.txt @@ -449,8 +449,6 @@ File Types (-i and -o options): datum Datum (default=NAD27) tpo2 National Geographic Topo 2.x .tpo tpo3 National Geographic Topo 3.x/4.x .tpo - navicache Navicache.com XML - noretired (0/1) Suppress retired geocaches navigonwpt Navigon Waypoints snlen Max synthesized shortname length snwhite (0/1) Allow whitespace synth. shortnames diff --git a/reference/navicache.xml b/reference/navicache.xml deleted file mode 100644 index becb69879..000000000 --- a/reference/navicache.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - diff --git a/reference/navicache~unicsv.txt b/reference/navicache~unicsv.txt deleted file mode 100644 index 4d8c74084..000000000 --- a/reference/navicache~unicsv.txt +++ /dev/null @@ -1,3 +0,0 @@ -No,Latitude,Longitude,Name,Description,Symbol,Date,Time,URL,Type,Container,Terrain,Difficulty,Placer -1,33.573583,-111.776450,"N00927","Eagle's Nest","Geocache-regular",2002/01/30,00:00:00,"http://www.navicache.com/cgi-bin/db/displaycache2.pl?CacheID=2343","Traditional Cache","Regular",3.0,3.0,"Trail Gyspy" -2,34.517550,-111.769633,"N00926","Clear Creek Cache","Geocache-regular",2002/03/11,00:00:00,"http://www.navicache.com/cgi-bin/db/displaycache2.pl?CacheID=2342","Traditional Cache","Regular",2.5,2.0,"Trail Gyspy" diff --git a/testo.d/navicache.test b/testo.d/navicache.test deleted file mode 100644 index 0634f9b6f..000000000 --- a/testo.d/navicache.test +++ /dev/null @@ -1,5 +0,0 @@ -# -# Navicache. -# -gpsbabel -i navicache -f ${REFERENCE}/navicache.xml -o unicsv -F ${TMPDIR}/navi.txt -compare ${REFERENCE}/navicache~unicsv.txt ${TMPDIR}/navi.txt diff --git a/tools/nuke_format b/tools/nuke_format index 95997dfc9..11097a6e2 100755 --- a/tools/nuke_format +++ b/tools/nuke_format @@ -31,12 +31,13 @@ remove_line $1.cc GPSBabel.pro remove_line $1.h GPSBabel.pro remove_manually $1 reference/help.txt +remove_manually $1 reference/format3.txt # Take out the boilerplate entries in vecs.h ... remove_line_containing extern.*$1 vecs.h remove_line_containing Format.*$1 vecs.h remove_line_containing include.*$1 vecs.h -# ... then let a human nerd snip3 the actual table entry awy +# ... then let a human nerd snip the actual table entry away. remove_manually $1 vecs.h remove_line_containing $1 reference/format0.txt @@ -47,7 +48,7 @@ git rm -f reference/$1* git rm -f xmldoc/formats/$1.xml git rm -f xmldoc/formats/options/$1.xml git rm -f testo.d/$1.test -git mv $1.cc deprecated/ -git mv $1.h deprecated/ +[ -f $1.cc ] && git mv $1.cc deprecated/ +[ -f $1.h ] && git mv $1.h deprecated/ # make && ./testo diff --git a/vecs.h b/vecs.h index 8a91dd040..f454ea2da 100644 --- a/vecs.h +++ b/vecs.h @@ -63,7 +63,6 @@ extern ff_vecs_t tpo2_vecs; extern ff_vecs_t tpo3_vecs; extern ff_vecs_t easygps_vecs; extern ff_vecs_t saroute_vecs; -extern ff_vecs_t navicache_vecs; extern ff_vecs_t gpl_vecs; extern ff_vecs_t text_vecs; extern ff_vecs_t html_vecs; @@ -241,7 +240,6 @@ private: LegacyFormat tpo3_fmt {tpo3_vecs}; LegacyFormat easygps_fmt {easygps_vecs}; LegacyFormat saroute_fmt {saroute_vecs}; - LegacyFormat navicache_fmt {navicache_vecs}; #if SHAPELIB_ENABLED ShapeFormat shape_fmt; #endif @@ -457,13 +455,6 @@ private: "anr", nullptr, }, - { - &navicache_fmt, - "navicache", - "Navicache.com XML", - nullptr, - nullptr, - }, #if SHAPELIB_ENABLED { &shape_fmt, diff --git a/xmldoc/formats/navicache.xml b/xmldoc/formats/navicache.xml deleted file mode 100644 index 120c54b10..000000000 --- a/xmldoc/formats/navicache.xml +++ /dev/null @@ -1,8 +0,0 @@ - - This is the XML format that's used by Navicache.com for - their geocaching data. There are a number of fields in it that are - marked "required" but are Navicache-specific, so GPSBabel can not - write these files, but we can still read them. - navicache.com - - -- 2.30.2